Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Feb 2012 00:59:52 +0000 (16:59 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 26 Feb 2012 00:59:52 +0000 (16:59 -0800)
commite66ceab6d2eccbce9ab6480e4175383134143924
tree3c038e89d2c41c560059462f9cb115475d3decfc
parentcb72e2491c58029cf8757609670494eca0c94ca4
parent0bf92dc79ac2a053ce0a761726cfa836e1c3f44a
Merge from trunk.